Fixed JS Problems