Fix a few more standards oversights for #2951