Fix JS Issues