AWS key regeneration fixes