Fix yet more import errors. Bump version