Fix some fixtures and leftovers from #2112, #2106 and #2104.