mescc: Struct fixes.