Couple more fixes