WINDUP-343: Fixes for discover properties, and some other issues

Maybe deserves some comment?