fixing centos build after refactoring and additions: this should hopefully do finally