lil tweaks

Change-Id: Id0db5cc7ed7e28ff0e6647daf379a7a5fbd2de49