Bugfixes and version bump