four small fixes