Fixed DNS and tweaked subnet macros