Two changes (20/26)

Two changes