Tactor bugfixes