Fix Linux warning regressions