Fixed Curator, Pathfinder and other small issues