Fix session create and destroy