Small fixes 2