fixes after merge

Change-Id: Ibfc52f2f3173992a18344ae9e622deb5720cc8b8