Updated CQC to newer Java version
Misc fixes and cleanups