Fix remaining items from #11