Patches after structure change