diff --git a/vhdlpp/expression_stream.cc b/vhdlpp/expression_stream.cc
index a37fea2ed..103e210ae 100644
--- a/vhdlpp/expression_stream.cc
+++ b/vhdlpp/expression_stream.cc
@@ -111,9 +111,10 @@ void ExpArithmetic::write_to_stream(ostream&out)
       out << ")";
 }
 
-void ExpAttribute::write_to_stream(ostream&)
+void ExpAttribute::write_to_stream(ostream&fd)
 {
-      ivl_assert(*this, !"Not supported");
+      base_->write_to_stream(fd);
+      fd << "'" << name_;
 }
 
 void ExpBitstring::write_to_stream(ostream&fd)
diff --git a/vhdlpp/subprogram_emit.cc b/vhdlpp/subprogram_emit.cc
index f3a2a428e..6f1b37508 100644
--- a/vhdlpp/subprogram_emit.cc
+++ b/vhdlpp/subprogram_emit.cc
@@ -70,7 +70,7 @@ int Subprogram::emit_package(ostream&fd) const
       if (statements_) {
 	    for (list<SequentialStmt*>::const_iterator cur = statements_->begin()
 		       ; cur != statements_->end() ; ++cur) {
-		  errors += (*cur)->emit(fd, 0, 0);
+		  errors += (*cur)->emit(fd, NULL, NULL);
 	    }
       } else {
 	    fd << " begin /* empty body */ end" << endl;