Fix handling of --verbose=... and BC break