JS Fixes