Fix PC Issues