fixed more build issues with qualifiers