BZ1128640 fix partial updates

This is for fixing the previous merge. 
There are two partial updates which needs fix immdiately.

Sorry for inconvinience!