continue fixing nonfree elements

Continuing my efforts from https://github.com/Itseez/opencv/pull/3149
Some little changes I forgot.