further small fixes