Further Java 6 fixes -- fix file creation.
Fix a bad import.