more mongoid fixes, etc