More mongoid migration fixes