Minor fix commits