Moar js fixes