More minor hiera fixes

Change-Id: I581992f36977a5e983d78f7191615f8ddaaea062