Fixes for Mono Compatibility