Fixed lintwarnings