Updated js issues