Small issues (22/25)

Small issues