Cleanup lint warnings