HWUI manager fixes