Updated to use latest lint from rodjek'