Fixed more errors concerning last commit