1j: minor fixes