More error logging and longer timeouts