Fix for missing functions which returns pointer