Fix 2 or 3 things