Fixed pupped-lint warnings