Various bits of file tidying...