Fixes for Rails 3 compatibility