Fix a few economy-related things based on info from 23a