few more fixes