Pre-commit fixes coming post-commit