Bug fixes and version bump