Fix up variable issues identified by packer