AMENDMENT NO. 2 TO, AND WAIVER NO. 3 UNDER, CREDIT AGREEMENT