Target Java 6 and fix a few docstrings