JS Bug Fixes