Qa hotfixes