Fix Mono issues