Display/data fixes