Fixing some aws cruft