more tweaks for aws