Hack in some client overrides for flags