last small fixes