minor issues solving