Tidying up after 9.1