fix r1.05 regression issues

Change-Id: Ic4442e915defdbba630cd2c4ae76578979b416a1