Fixes and jsclass integration