Fix all mcde related errors for now