Fixed compilation problems after the last PR, and extended bugfix to XING education as well.