Fixed a few missed bugs from old config