more compile fixes from randomconfig run
2 files changed