JS FIxes