Bit of work towards #658 and some work towards fixing some error the source viewer is throwing...