More fixes

Change-Id: I8165240276cc55941c6a4a59181272c0e20c0551