Backport Meteor 0.8 fixes