Experimental Mongoid support -- fixes