some fixes

Change-Id: Id763732a94eda4ffa621dbd19a52df280e53037f