more fixes in