More minor tweaks mirroring TPB-06 dev.