More configuration flags for #913