Fixed JS Errors