merge some wayward configs back in