CHANGES

Updates for consistency and better handling of missing stuff

Change-Id: Ia9e5ca329aa3390db54c864e894d813aaad4f55e