Three Fixes to Prevent Another Battle of Lafayette Square