Further small fixes