Fixes and version bump