tpokorra some fixes for Mono