Minor config adoptions