More lsf fixes