Fix some recently broken functions