mstruct fixes