Fixes for new JS