Bump version - minor cleanups