and now for more fixes!