Fix 2 previous commits