Fix up the server sample catalog datashapes