CS fixes and double declaration of Session handling.