Fixes for Amazon