fixed if statements for OS changes