Small issues (13/25)

Small issues