Little Tweaks

Change-Id: Ia5d7ddbd71e6027e19fcc388968bebe6f7cbef2c
Signed-off-by: Jayant Pratim Saikia <jay.saikia@gmail.com>