Fixes from MonoGame work.