Experimental fixes

Change-Id: I63db722e5edb07ab900db417950cf3fbda8790c2