Fixes for mono