Various tidying for release