Small data fix-ups