Fixed some Mac/Windows issues.