More ec2 build fixes