Add longer s2w timeout, fixes