more Amazon fixes