Fixes #60, 61 Apply changes

From Vibe Protocol 3.0.0-Alpha4 and Vibe Java Platform 3.0.0-Alpha6