Follow up: fixes