Fix support for static schemas.