Yannick Various Fixes