moar fixes, more coming

Change-Id: I0311f34c41f2727966e25ea08a563687faa27bf9