OMNIBUS AMENDMENT AND WAIVER