Introduce some fixes from latest kuinameplates