more hiera fixes