fixing some known errors

Change-Id: I9794f94743a46f9fe71ba24c089760529c8f11cc