Resolve forward references