mods to support AWS deployment