Compile 11.0 - Minor changes applied