additional small fixes