fix compile failures resulting from last few commits

2 files changed