various tweaks - kylon

Change-Id: Ife97c3ee99ecc0febc3753e93cf23c4724454c78