Couple more fixes from Merthyr