Re-re-fixed building on Linux