Two changes (18/26)

Two changes