Congress averts shutdown; fight continues over pandemic aid