Small issues (2/25)

Small issues