Fixups.
Start of Suricata build and option handling.