Fixes for assembly over cut cells