Some clean up and fixes

Change-Id: Icc822a54776fb748495744bc7cd6ab6037bc7516