[issue1003] Leftover fixes from #309