Server commit , errors fixed