Follow-up: fixes