Enhanced performance on non-Windows