Small issues (16/25)

Small issues