Updates to support Meteor 0.6.4.1