Small data fixes