Fix loading context *ns*
Fix infinite loop in patched macros