timneout bugfixes