fixed a few things

Change-Id: I4b2f341576df1426df62340e26cf307e60e4c74b