Fixes for Meteor 1.0