Various tweaks

Change-Id: I14847e33f98663b317a33329eece0e39753b9fae