more elapsed_timeout fixes

Signed-off-by: Olaf Hering <olaf@aepfle.de>