diff --git a/src/scm/html-generator.scm b/src/scm/html-generator.scm
index 1f9fddb422..5dd7f6ecba 100644
--- a/src/scm/html-generator.scm
+++ b/src/scm/html-generator.scm
@@ -554,7 +554,7 @@
 
 ; Create a column entry
 (define (html-table-col val)
-  (html-table-col-align "right" val))
+  (html-table-col-align val "right"))
 
 (define (string-html-table-col-align val align)
   (string-append "<TD align=" align ">" (tostring val) "</TD>"))
@@ -623,7 +623,7 @@
 	    #f)
 	">"
 	(tostring val)
-	"</TH">))
+	"</TH>"))
 
 (define (html-table-headcol val)
   (html-table-headcol-justified val "center"))
diff --git a/src/scm/report/average-balance.scm b/src/scm/report/average-balance.scm
index adf84f61b0..491a326a14 100644
--- a/src/scm/report/average-balance.scm
+++ b/src/scm/report/average-balance.scm
@@ -366,7 +366,9 @@
                      ;; FIXME - the '1' below is hard-coded and should
                      ;;         be abstracted. Just a temp fix while
                      ;;         the query api gets fully wrapped.
-                     (gnc:query-add-account gncq acct 1)) accounts)
+                     (gnc:query-add-single-account-match gncq acct
+                                                         (cons 'query-op 1)))
+                   accounts)
 
               (set! acctcurrency (gnc:account-get-currency (car accounts)))
 
diff --git a/src/scm/report/balance-and-pnl.scm b/src/scm/report/balance-and-pnl.scm
index 3c50a1d7f1..e41daad0fb 100644
--- a/src/scm/report/balance-and-pnl.scm
+++ b/src/scm/report/balance-and-pnl.scm
@@ -86,9 +86,9 @@
     gnc:*pnl-report-options*)
 
   (define (render-level-2-account level-2-account l2-value)
-    (let ((account-name (list NBSP NBSP NBSP NBSP 
-					(gnc:account-get-full-name
-					 level-2-account)))
+    (let ((account-name (string-append NBSP NBSP NBSP NBSP 
+                                       (gnc:account-get-full-name
+                                        level-2-account)))
           (type-name (gnc:account-get-type-string
                       (gnc:account-get-type level-2-account))))
       (html-table-row-align
@@ -110,11 +110,10 @@
 
   (define (render-total l0-value)
     (html-table-row-align
-     (list (html-strong (string-db 'lookup 'net))
+     (list (string-html-strong (string-db 'lookup 'net))
            NBSP NBSP 
            (gnc:amount->formatted-string l0-value #f)
-	   NBSP NBSP 
-	   )
+	   NBSP NBSP)
      (list "left" "center" "right" "right" "right" "right")))
 
   (define blank-line
diff --git a/src/scm/report/budget-report.scm b/src/scm/report/budget-report.scm
index 7c9d6e2deb..ee6aa967ab 100644
--- a/src/scm/report/budget-report.scm
+++ b/src/scm/report/budget-report.scm
@@ -535,7 +535,7 @@
 	  report (budget-subreport-get-maximum-expected subreport))))
      (budget-entry-get-subentries entry)
      (budget-report-get-subreports report))))
-	       
+
 ;; calculate the nominal value.
 (define budget-report-set-nominal!
   (record-modifier budget-report-structure 'nominal))
@@ -662,16 +662,18 @@
       (gnc:group-map-accounts
        (lambda (account)
 	 (let* ((line
-		 (budget-get-line-hash budget-hash (gnc:account-get-full-name account)))
+		 (budget-get-line-hash budget-hash
+                                       (gnc:account-get-full-name account)))
 		(line2 (cond (line line) 
 			     (else 
-			      (vector-ref others (gnc:account-get-type account)))))
+			      (vector-ref others
+                                          (gnc:account-get-type account)))))
 		(acc 0)
 		(filter-pred (budget-entry-get-filter-pred 
 			      (budget-line-get-entry line2))))
 	   (budget-report-set-account-type! (budget-line-get-report line2)
 					    (gnc:account-get-type account))
-	   (cond 
+	   (cond
 	    ((budget-entry-get-action (budget-line-get-entry line2))
 	     (set! acc 0)
 	     (gnc:for-each-split-in-account 
@@ -803,8 +805,8 @@
     (case type
       ((gnc:budget-day) (+ 1 
 			   (remainder 
-			    (inexact->exact (floor
-					     (gnc:date-to-day-fraction caltime)))
+			    (inexact->exact
+                             (floor (gnc:date-to-day-fraction caltime)))
 			    num-periods)))
       ((gnc:budget-week) (+ (gnc:date-get-week-day lt)
 			    (* 7 (remainder 
@@ -812,10 +814,11 @@
 				   (floor (gnc:date-to-week-fraction caltime)))
 				  num-periods))))
       ((gnc:budget-month) (+ (gnc:date-get-month-day lt)
-			     (let loop ((month 
-					 (inexact->exact 
-					  (floor
-					   (gnc:date-to-month-fraction caltime)))))
+			     (let loop
+                                 ((month 
+                                   (inexact->exact 
+                                    (floor
+                                     (gnc:date-to-month-fraction caltime)))))
 			       (if (= 0 (remainder month num-periods))
 				   0
 				   (+ (loop (- month 1))