fix some external stuff