Updates to fix issues in Best Path Selection