Bug 907904 Fix string correctness issues r=bsmith