Tidying up, fixing mountpoints.