Amazon S configuration fix/improvements