Fix delcarations