Fast data fixes