Some fixes for mono