Add spark to conflicts
Fix FC023 by setting sane defaults