more fixes
more fixes(2)