Fix for missing functions