make more fixes