Assembly Fixes

This is to accommodate some changes needed to handle the insertion logic
not interfering with the editor running.