Misc fixes for latest Meteor