Fixup shape use/imports
Bump version