FAKE changes for mono compatibility