Fixed even more errors