Small issues (11/25)

Small issues