Very minor stuff gearing up for next move
A few speculative overrides and tweaks
A few more exploratory overrides