Additional js bug fixes