Final modifications for smooth compilation