Fix some lint suggestions
Fix warnings