Small fixes 2.5.2