Apply limelight fixes

Two graph-related fixes that were made to limelight, applying them to spotlight, too.