Small fixes 3.