Fixed a few other places as well
3 files changed