Fix 2 compilation errors