Fixes from #20