Further code improvements, CKAN not cooperating.