more fixes

Change-Id: Id539916bb1618c21aa729c65231d60785f08d271