Fixed some assignments