Bug 981828 - fix lint problems