Fix js issues