Improvements from RailsHotline call