small fixes for PND resolving