Adding small fixes