Fixing other areas where the path may be prefixed...