Some lint warnings remved