some fixes
17 fixes