fix ec2 instance labels, try to figure out blank thrift entries & bump