couple of small fixes left