TSLoad: Small bugfixes