Small fixes 4