Fix assembly issues

I think...