Fixed a few oversights from last commit