Even more javascript fixes