More LSF support in the midst of graphics tweaks