Fixes #32 apply changes from Vibe Protocol 3.0.0-Alpha4