Minor fixes. Don't forget minimum number of elements.