more changes to move to Rails 3