Fix some assignments