Fixes minor issues found while testing prior to Rails 4 migration