Minor bug fixes in the EC2 automated build script.