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

Hacky, but can we do something else with Procyon, as it is now?  I guess not.