[FOLD] header tidy fixes