A pair of small fixes