Fix some JS stuff again