First changes of 3.3.1 Just some small ones