Fix 2 errors caused by recent commits
2 files changed