Fix Issues with Pebble OS 2.1