Update defaults and clean up config check