LSF fixes [ci skip]