Some changes for mono