https://patchwork.freedesktop.org/series/45627/ should fix the second breakage, after Roland's fix for the first one.