Fixed a couple more errors