Slightly improved stage header updates and fixed a couple of warnings.