small data fixes