Fixed legacy paths