First TS3 bugfixes