Small issues (25/25)

Small issues