Some mono fixes