More work to get TC mono builds working