2nd small fixes