Couple more wee fixes