Fix Javascript Issues