Suri fixes v1.0

Here's a small series of patches I've made when playing with suricata on my test systems.

PR builds:
- PR build: https://buildbot.suricata-ids.org/builders/regit/builds/99
- PR pcaps: https://buildbot.suricata-ids.org/builders/regit-pcap/builds/38