extra fixes

Change-Id: If74511f477805692f0ed321fb4ddbb00e148925c