More lint fixes