fixes for Yvonne