Guideline fixes for Java

Fixes #21