Small changes preparing for JS