#86 improve compatibility with EC2 CLI env. variables