Visual fixes

Change-Id: I7d1ba245ca62efa139473db4fcf17289ffe63472