Fixed some things that fail tests on mono