Bug 966067 - Fix some minor problems in previous commit;r=me