Small issues (17/25)

Small issues