Small issues (23/25)

Small issues