Fixes to ensure concat works and subnets can be enabled/disabled