Small issues (3/25)

Small issues