Few small fixes