dart2js fixes