Couple more fixes.