Fix goyaml import
Fix Retry to properly handle non-retriable errors