Quick updates [#73124168]