Fix PropertyPathMapper reference handling