More fixes around EC2 compat