more fixins for the awscli work, seems to be mostly working?