Fixed Session issues