Further fixes to external fucntions