Last round of fixes

Change-Id: I34606f2b3e3cb2bcc9e12e1e9bec6c592f87dc6b