Suricata beta2 and a couple of small fixes.