Backfill

These changes are to play nice with ActiveSupport/Rails 2.