More restruct patches