N+1 fixes