-- small fixes