cosmetic fixes

Change-Id: Ie521ea9e9be19e7df2ea1fdf3601997514aae9dc