fix some reprucussions of making cross-build work
fix cross-build effects