Small issues (6/25)

Small issues