Fix up comm-central for bug 345123 and bug 967364.

--HG--
extra : rebase_source : 5dfb13fcd2ef3b5c838220daadf4f848827e1ed8