Bugfixes in Timeouts