Continue to fix shit for Rails 3 compatibility!