Bug 981828 - Fix lint errors