Meteor 1.0 and minor optimizations