Spain and France minor border fixes