Fix 2 issues