3 more fixes from Shaun