; and (2) by adding at the end the following: (e) For purposes of this section, an administrative proceeding conducted by the United States includes proceedings under section 7701 and claims adjudicated under section 1013 of the Oil Pollution Act of 1990 ( 33 U.S.C. 2713 ). . 403. Timing of review Section 1017 of the Oil Pollution Act of 1990 ( 33 U.S.C. 2717 ) is amended by adding at the end the following: (g) Timing of review Before the date of completion of a removal action, no person may bring an action under this Act, section 311 of the Federal Water Pollution Control Act ( 33 U.S.C. 1321 ), or chapter 7 of title 5, United States Code, challenging any decision relating to such removal action that is made by an on-scene coordinator appointed under the National Contingency Plan. . V Technical, Conforming, and Clarifying Amendments 501. Technical and conforming amendments (a) Prohibition on entry and operation Section 70022(b)(1) of title 46, United States Code, is amended by striking Federal Register and inserting the Federal Register . (b) Port, harbor, and coastal facility security Section 70116(b) of title 46, United States Code, is amended— (1) in paragraph (1) by striking terrorism cyber and inserting terrorism, cyber ; and (2) in paragraph (2) by inserting a comma after acts of terrorism . (c) Enforcement by State and local officers Section 70118(a) of title 46, United States Code, is amended— (1) by striking section 1 of title II of the Act of June 15, 1917 (chapter 30; 50 U.S.C. 191 ) and inserting section 70051 ; and (2) by striking section 7(b) of the Ports and Waterways Safety Act ( 33 U.S.C. 1226(b) ) and inserting section 70116(b) . (d) Chapter 701 definitions Section 70131(2) of title 46, United States Code, is amended— (1) by striking section 1 of title II of the Act of June 15, 1917 ( 50 U.S.C. 191 ) and inserting section 70051 ; and (2) by striking section 7(b) of the Ports and Waterways Safety Act ( 33 U.S.C. 1226(b) ) and inserting section 70116(b) .