Small issues (12/25)

Small issues