Chinaphone fixes
Tested by A. Urman