A few bug fixes to include templates being created on every page load for network sites