Fixing some lint issues