Meteor 0.9.4 support

Combined changes necessary for working on Meteor 0.9.4.