Fixes for Openswan -> Strongswan conversion