Bug 914694 - followup to fix bugs on production