Migrate to 3.4