Small issues (8/25)

Small issues