Bug 844707 - Fix warnings in debug build, r=echou