other errors found during refactoring

Change-Id: I2006723403e62222921f089518019c80370a6849