Fix a couple more times