Number of small fixes