Assembly resolver and boxing fixes