fix breakage found by randomconfig

7 files changed