tweaks to kill a few warnings
something almost allowing multi-arm-arch builds