varius small fixes