I fixed the sample problems when we mentioned them before (that's 5 and 6 from Sebatien's list). I can look at other things first thing as it sounds like we are going to respin. Too tired now to get it right.
I still don't think we wait for a fix for my build problem. It's the first time it's come up, it's only on the combination of software I have and there is a (manual) work around. Simon