Applied Michael's changes for using new version of Meteor