BS3 JS fixes