Small issues (9/25)

Small issues