small fixes all over the place