final ext/session fixes