more fixes (sigh, regex updates). Should now work with meteor 0.7