fixes for session 9 from @fulv
fixes for session 10 from @fulv