Small data analysis fixes.