small fixes2