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

This is OK for now if it works (which is surprising and cool,) but we should find a real fix/patch for procyon at some point.