Fixed issues from Meteor Upgrade.