Small updates to allow for proper data to be shown