pull more fixes