Couple more fix