Config fixes for EBS...