Couple of more fixes