Fix remaining UNIX regressions