Hotfix and version bump to 2.3