Merge broke playercontrol.cs because Macs