Misc. bug fixes
Variables are not called subnets.