Fixing some lint issues. Tire don't pass the lint but almost.