More fixes for hiera

Change-Id: I4ad5b26b3d98c66769be92779af3dce529c9eb64