Tidying up as part of the update to 0.9.0