Proper fixes to make sa.ckan.net work with 3017-demo-stable