Fixes for js