Some fix in the first section