Another small batch of quick tweaks for 1.7