Final touches on allow EC2 only