Bug 12063 - Fix QA failures