minor issues fix