Misc fixes

- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/96                                                                                                                                                          
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/17

Makes a few changes in https://github.com/inliniac/suricata/pull/719 unnecessary.