Automata tweaks.