Small issues (15/25)

Small issues