Reduce timeout and remove false eror reporting