Third small fixes