some fixes

Change-Id: Ibd0067418435442d8cff922faf8ef0f6a5a28761