few fixes

Change-Id: I845e1df4e8e23e0023a5179f7b9c5482c3478cc7