Fix autonamed trunks
Tidying
Bump version for bugfix