Updates to latest Splot changes.