More lint fixing