three small fixes