Additional small fixes