Some fixes to Meteor model