Work around as-needed bugs.