more fixes!