Tweaking some old systems, nice to see them working properly again