some other small fixes