More misc tidying