Qa minor fixes