more fixes?