Fixes from amazon deployment