more fixes yet