Fixing some mono issues