Changes to enable passive mode (mainly on AWS)