Some more exercise tweaks