Minor fix based on suggestions