Fixing more errors !!!