solve some issues after merge from mischa