Fix a couple of small issues with the Java project layouts.