Tidy up after 1.1