More mono friendly changes.