Project definition fixies...
Scala generated code fix...