Changes for new Scotland data

Some changes required to use the new Scotland data, and
a minor fix.