Clean up some more javascript issues