Fixed compile errors (again ..)