More mono fixes