Numerous fix up

Change-Id: I89276eb2d7cd81a25f7b402dd98bed477ac386cf