Fix listings of systems and tools