additional fixes

Change-Id: I55af1989f2fbe0ceb6740dfd285d7e34ef1e9c8c