A few more flags and small fixes.