Fix per suggestions from #17