Minor pre-3-0-7 tweaks/fixes