Small fixes
small fixes