Further mcs 3.2.3 compilation fixes
More mcs 3.2.3 compilation fixes
Fixes compilation with 3.2.3 mcs