small fixes recommended by reviews