Mono fixes for 4.5