Small issues (19/25)

Small issues