few more fixes
few more fixes