Misc fixes

https://buildbot.suricata-ids.org/builders/inliniac/builds/49