Add some GDPR stuff and fix two bugs