Fix for external functions and strings