Fixed more lint warnings