Small issues (4/25)

Small issues