I eventually managed to get around this by deleting all the volumes/partitions on the disk and starting from scratch.