Misc Fixes

https://redmine.openinfosecfoundation.org/issues/1120
https://redmine.openinfosecfoundation.org/issues/1121

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/217
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/137