Miscellaneous changes to fix code for Rails 3.2