4th small fixes