continued bugfixing of Titan for TP3