Added more mono specific fixes