Some more fixes for the OS name from testing.