fixes on JS