fixes for session 6