Fixed several lint errors/warnings.