more compatibility fixes for timeouts