Fixes to end all

Change-Id: I680bd3dd8278f34f91281768d3a644f80c122d7d