Fixes

Change-Id: I00e8961df8f11a8730ef6b170e269a95c2d0f7e2