Two changes (4/26)

Two changes