Some changes to cope with new build etc...