Updated references to avoid compilation errors 
with recent versions of mono