Small issues (14/25)

Small issues