fixing some issues that might have caused timeouts