more fixes from @lukebakken comments