re-created AL's EC2 fixes in develop-prod