small fixes all around