Improvements from #chicken