Nuweb macros fixed