Fixed some lint issues