Update for #1724 flags and tables