Fix unitialized variables

Change-Id: I874e273b691fb66d4eb769334a539de9db9b7834