#320: Some improvements