few more fixes
fixes