Fixed compilation issues after 3.7 import