fixes in hedging and security logout changes