Do small fixes