Two changes (15/26)

Two changes