Fixed assembly errors