Fix compile error due to singleton changes in MR1