Another small fixes