Lsf fixes