Minor changes and version bump