Fixed issues with some OS's