Two bugfixes + version bump