Mono fixes for 5.0