Fixes for meteor 1.0