Intermediate changes while we fix the load of 32's everywhere.