More minor JS Fixes