Fixes to no-js version