Bug789 v1 part2

Some small fixes. This has to be merge after PR https://github.com/inliniac/suricata/pull/437.