Fixed some assigns