More tidying up from Tims rebase screw up