[TO STAGE] Bug 910630 and 910442 - Hotfixes for severe issues

Fixes two urgent issues raised by consumers.