Finalizing fixes for Java-based configuration.