Fix issues with EC2 rename, EIP ls and associate