Small fixes for the session id patch