Misc fixes 201411

Hello,

Here's a small patchet with minor fixes and improvements.

PR builds:
- PR build: https://buildbot.openinfosecfoundation.org/builders/regit/builds/18
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/regit-pcap/builds/16