Small fixes according to discussion in strongswan/strongTNC#2