Fix a few hard-coded constants