fix 2.6.16 issues, from mini_fo git repository