more fixes for session06