Fix problems after extracting authoritative resource definitions to commons