Fix PC Issues

;