Minor fixes and version bump