Fix Some more errors