Small issues fix