Fix some lint issues