Fixes for amazon deployment