Project fixes for mono