Fixing import resolution order, version bump