Misc fixes

- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/135
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/55