Small fixes
small fixes 2nd try