Fix 6 out of 7 functions