Fix checks display in various scenarios