diff --git a/include/class.orm.php b/include/class.orm.php
index 588ccca520b12760c82b4845e93b7c6ea70516e1..7152745ab521c7b1b578761804402a48e0c6fb0a 100644
--- a/include/class.orm.php
+++ b/include/class.orm.php
@@ -1078,7 +1078,7 @@ class QuerySet implements IteratorAggregate, ArrayAccess, Serializable, Countabl
         return $this->_count = $compiler->compileCount($this);
     }
 
-    function toSql($compiler, $model, $alias) {
+    function toSql($compiler, $model, $alias=false) {
         // FIXME: Force root model of the compiler to $model
         $exec = $this->getQuery(array('compiler' => get_class($compiler),
              'parent' => $compiler, 'subquery' => true));
@@ -1229,7 +1229,7 @@ class {$classname} extends VerySimpleModel {
     }
 
     static function getSqlAddParams(\$compiler) {
-        return static::\$queryset->toSql(\$compiler);
+        return static::\$queryset->toSql(\$compiler, self::\$queryset->model);
     }
 }
 EOF;
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 54e091936469bdc504bbc584097e82f5efc50d5e..89e880e0db8dde3d0ea065a16ed885cd2d6a79bb 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -984,6 +984,7 @@ img.avatar {
 }
 .thread-body .attachments .filesize {
   margin-left: 0.5em;
+  line-height: 1em;
 }
 .thread-body .attachment-info {
     margin-right: 10px;