Fixes from #3