shell fixes for session