Two small fixes