Fix known lint issues