fixes revealed by randomconfig run

3 files changed