Fix custom hiera variable lookup issues