other small fixes