Fixed a few oversights