Fixed JS Issues