Minor fix-ups