Fixes for crosstool-ng fork selection