Two changes (23/26)

Two changes