Two changes (24/26)

Two changes