Fix 2 errors caused by recent commits