fix aws prefix issues