Hygine: couple insignificant changes

Change-Id: Ia57559d0debeda52c834e319a63e684f71820a73
Merge "Hygine: couple insignificant changes"