More lint issues