Bug 929031 fixes for lightbeam page after push