Minor building tweak and the country and state changes we discussed on IRC.