Fixes to project files, and fixed Java errors that AIDE didn't notice.