Fixed some compatibility issues w/ new version of ActiveRecord