QTC bugfixes