NS fixes and automatic clone support for local instructions