Various tidying up.