Qual: Various fixes