Follow-up: fix bugs