More JS Fixes