Minor fixes and js dep update