Fixes for Java SDK 1.0.9-SNAPSHOT