roll in more fixes