couple of small fixes