Fixing specs according to the new subnet setup