Small issues (5/25)

Small issues