Fix non-Windows issues