Minor changes around the trireme version and timeouts