Fix broken functions