Fixed several lint warnings.