more assembly variant fixes