Resolve problems after menu merge