minor changes for EC2 building of things