Small fixes 1