Yeah, I typed upgrade by mistake. Old habit, especially as the two words are so similar.
But there was something wrong with my Pi anyway, so I'm doing a full dev build, with the HGI80 installed.
Perhaps I should take an image when I've finished - might save others a few hours work.
P.