Quick maintenance fixes to two completely broken functions and a missing expected behavior.