Follow-up for Bug 1036825 fixing 2 issues. r=aeftimie, r=amatei, r=hskupin