Client fix and session expiration