fixes for many errors

Change-Id: Ic72a7490c7375f40f9e28f96c4dee17423f2b437