Openrc non-conflicting configs

Tried to put in non-conflicting changes here.