Fix 2 issues with compilation