collection of small fixes