more fixes.

Change-Id: I1ad62452fc32cfde415ba57ff5443600bec8af3b
Fixes fixes everywhere

Change-Id: I9797d79dc7cb9b5d32c2bbe66129d6fbfe39ba86