Grease the Engine

Latest batch of fixes for main branch get it compiling main branches on Jenkins.