more minor tweaks to complete jquery upgrade