Fixes from #100