Fixed some code corruption post-commit