Fix issues with external resolving