More fixes v1

https://redmine.openinfosecfoundation.org/issues/1090
https://redmine.openinfosecfoundation.org/issues/1089
https://redmine.openinfosecfoundation.org/issues/1091

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/198
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/118