ENH: Better app consistency