Compatibility update

Fixes a few bugs related to compatibility with old handsets.