rebuild js + fixes #7583