Further extras tidying