Fix assembly linking issues