Marking bugs 938228 and 964367 as completed