Tweaks to work on Amazon