Add fixes

Change-Id: I3aed8c2841e266cbea0d68cd3666941c3a19b41e