fix some build issues with current resolver