Adjustments for Java 1.6. Release 0.3.0.