Fixed a couple errors in previous commit I didn't notice