qualifier fixes