Some JS Fixes