Session + Date issues fixed