Further tuning to fix compilation on other machine