Fix grains for Amazon and Fedora Remix

Thanks to @thekuffs for catching this.